DO NOT MERGE

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

Bug: 120502534
Change-Id: Ie1ceb243b20409cde1851c7971479f0dd66136ef