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

Change-Id: I417e0e2b6b126ffd8e24f7df096822a7d18360a9