Merge \"Merge \\\"Teach hard keyboard settings about correct user ID\\\" into...
Merge \"Merge \\\"Teach hard keyboard settings about correct user ID\\\" into nyc-dev am: db6f1f2c am: cfe0f074\" into nyc-mr1-dev-plus-aosp
am: c54df791
Change-Id: I115a64d939ac4a0cc3725d7f1a97726bee353652