[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 86d34ada13  -s ours
am: 476c055010  -s ours

Change-Id: Id38d729cae4904405a81a7163e937cdb8d6c6bd8