am 9c95015b: Merge "Improve support for the barcode-on-screen use case for...
am 9c95015b: Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev
* commit '9c95015b':
Improve support for the barcode-on-screen use case for wearables.