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

Change-Id: I7c7f045e8731f9cb181378d37da2d3b1cc7122be