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

Change-Id: Ia815ee763982ce2d041a6789af3151f1a0902252