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

Change-Id: I6e0c44dcc56f2aebe4f39fbf7894781716d6dffa