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

Change-Id: I7d7825b423299d2d561ba01a74665a51676d0815