[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: a7d38cd0 -s ours am: f389c02f -s ours am: efc6681c -s ours Change-Id: I508167e9c1ea5c465768c980e4c7c05898231cbd
mentioned in commit 78e2f03b