DO NOT MERGE

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

Bug: 120502534
Change-Id: I4d8757a4bed5d3c630415bb9a52f754446de34a6