[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 906f0f6c -s ours am: 66936511 -s ours am: ef03a8ae -s ours Change-Id: Ie055644dcf0d828b1422c5351c3b038ab79dcf75
mentioned in commit 4f207e15