[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: e74b55e199  -s ours

Change-Id: Ie61de309ee3366d572d6b02177f0650fb300e417
tree: 8e495efc62fb2b64ddb36917454ea3c6b223510b
  1. library/
  2. PREUPLOAD.cfg