[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 9e649433 -s ours am: 36e62840 -s ours Change-Id: I613c878602b406b26321cdd2f845090a4bf222b7
mentioned in commit 19c4ca9d