am 472b990a: am 07e8b2fb: am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev

* commit '472b990ae11f4ae4c16d90cbb02e9efa868db382':
  Improve support for the barcode-on-screen use case for wearables.