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

Change-Id: I4c8f0100237083192da8961e65691dd3e0327296