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

Change-Id: I45f2491e6b54c16ea08caddb868c3cac23aae06f