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

Change-Id: I79ba1ac7886031a6a4d59f4462624f130e8566d6