[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: b74a1466 -s ours am: 3b45dc91 -s ours Change-Id: I516d60ab1bd6928566c97b52358f4e86f89111de
mentioned in commit 4ef7b2a8