DO NOT MERGE

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

Bug: 120502534
Change-Id: I161a7f2a5b1dbeb8824bcc4ea18beeeb6eb284ac