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