[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 4a3b1136c7 -s ours
am skip reason: subject contains skip directive

Change-Id: I0b0a72677f81bcd926e40e47b7b17acfb41a7f26
tree: 76212e7901a47e59cbac4e61149d00616adad86f
  1. MODULE_LICENSE_APACHE2
  2. NOTICE
  3. OWNERS
  4. README.version
  5. core/
  6. qr_scanner/