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

Change-Id: I3556d7f463928478a54d5aedc2f5d6f1cc89ab90