[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: e74b55e1 -s ours am: 8e024933 -s ours Change-Id: I71333f88f13706181ff5176ee00561b05c88957e