DO NOT MERGE

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

Bug: 120502534
Change-Id: I90ac0001ae6f3be967dc5608d3c68c1c9d05ed33