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

Change-Id: I07e9a635c4febeb99c78976e74fdf49cc190da96