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

Change-Id: I2f6eab8726d7b058584fe2843f979beae13c69d3