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

Change-Id: I69e288b109ff8d776e6bc07065e15c44805cde07