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

Change-Id: Ic7e36caa8b13e4b01f176f430a5344fc936e113e