DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001, history only) into master

Bug: 120502534
Change-Id: I3d674905eb9b62340da4fc12eeb900a5893a7f43