[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 4f788d083e  -s ours

Change-Id: I1d849ff86f15ed20af92f97a5ebe9455a997498c