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

Change-Id: Id3a9eaff4e418e88b2574b50fd0aff056124e38c