DO NOT MERGE

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

Bug: 120502534
Change-Id: I68803f82bae399efe4e0f73ebe39392bc86e0622