DO NOT MERGE

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

Bug: 120502534
Change-Id: I3bffa9fcd0056d22ba718438fc0b1dbbcb8f873a