[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 473f1e05 -s ours am: c805ec43 -s ours Change-Id: I9b52843599d8f1d4153ec356e9dd835408762238
mentioned in commit 3ade6652