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

Change-Id: I9cd3deb7ea918b7acb6059bfab9c4918551beea8