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

Change-Id: I09ac8e964a86d511e2a71d54f1e16f5b94615950