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

Change-Id: I871dd6f91e8252b0165ed7667a6e5a4f35eb3cb8