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

Change-Id: Ic6dbf96981dea912329c9cc75320d733205a0ee3