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

Change-Id: I7581673d63a62fd46130cdb2cc5056e96579a9b0