Merge "Fix single field highlighting for autofill." into rvc-dev am: cc45f332 am: 8c9f394c am: ba68dbfd am: 2ec0a4e6 Change-Id: I9186b09778cf3a9cf09a4bd7ef97545250566beb