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