[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: a796f29166  -s ours
am: b71892e513  -s ours

Change-Id: Id32dc0d48bd189aa3672de07347c1b71b0d33f1d