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

Change-Id: I0b6538c6017d84591bce7a139e3423bcdd8f7d0a