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

Change-Id: I409bb3cb14af169bb7d83022b8ad249da1436ff7