DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

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