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

Change-Id: I908cf80da1ff16abed0e037f47543efb411e85a1