Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
am: db6f1f2cb5

Change-Id: Ie47fd6128435c75cc08d3d478a23c442f44a514c