[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 4957d0c498  -s ours
am: 0c8847a7c2  -s ours

Change-Id: I15b2556f55e8507fe089952fe0ab0fc57a305ee3