DO NOT MERGE

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

Bug: 120502534
Change-Id: Ib209878ff3797875a37c4a3a354df518c52436b2