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

Change-Id: Ib1c72d0fa217b5f0a254c95c4cfd95764a34c44f