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

Change-Id: Iff1211430e0f7a323b6433bd4c980b210b69c957