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

Change-Id: I6b5fd637ace97564e1f21198ac503ada8e17297e