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

Change-Id: I9df34cef5942c9f94b50b2eef1cf39a121b8ddde