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

Change-Id: I26e0b51cf94890dc832bfc8038a1529e7b36f818