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

Change-Id: I274fb74b82dd46f17964f67d61fe93ed0635eb80