[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 2cee90708c  -s ours
am: f7899e2db0  -s ours

Change-Id: I6fe899889aca8eada05e3b678dacc8a98d079545