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

Change-Id: I14835cf805760f2f36e14d5d165f325a93502a94