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

Change-Id: I899b3521cd70f19ccb8ec8bd0469401e555dc9a3