am a1327a40: am 762024f9: am 597ee941: am b3eddaf3: Merge "Remove stale keylayout annotations" into lmp-dev

* commit 'a1327a40c64b9a2b39b093f895ec2957e92f1456':