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

Change-Id: I83d84e2ba66f3a207c9ceca5a43b68dc5062f13d