Merge "[SdkSetup] Set physical keyboard layout" am: c3aecfaf2e
am: 8810570222

Change-Id: Ib0a79668c3fc8e47a2195f791b06f23869e77175