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

Change-Id: I1558514a5ee3db5f9af847db9fe5860254f97089