[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 9e649433ae  -s ours
am: 36e628402a  -s ours

Change-Id: I613c878602b406b26321cdd2f845090a4bf222b7