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

Change-Id: If42fee8e60bd771c56f3dfabaf05fa3c1ba7d538