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

Change-Id: Ifae5dc43310747d0acde1aa4f4b2f67553d1a8b5