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

Change-Id: I34ecab82202a426158044ee20b7dd03a0d1e3085