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

Change-Id: Icdf0a2e5bbc18f02a642c0ee9cbea61fcf08c6bb