Revert submission 3069323-revert-3066748-duplicate_entry_fs-CIBDJQYRHU Reason for revert: relanding with forward fix Reverted changes: /q/submissionid:3069323-revert-3066748-duplicate_entry_fs-CIBDJQYRHU Change-Id: Ica5a126446ca2dc07a40e4ff9866389b5d164eab