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

Change-Id: Ie23d6efbd6c751f6f1cd7701754dbad61375f8bd