[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: da1f8b24  -s ours
am: 004c9086  -s ours

Change-Id: I1ba9ea3d6258ba63df7af2cd5fe7626cf2931c9b