Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Iad478362d4242e6cfbb8737ab7c9c1329cd9bbf2