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

Change-Id: I37ee55f5974d05594d32e55d3965fd3b2d8c819e