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

Change-Id: Id10ccae7dcf20512d83860af1fec56d00b1218f1