Merge \\\"Teach hard keyboard settings about correct user ID\\\" into nyc-dev...
Merge \\\"Teach hard keyboard settings about correct user ID\\\" into nyc-dev am: db6f1f2c am: 75778049
am: a95348d6
Change-Id: I5c922c8cb5f51bb9072b6c1802ca789ce6a6975b