DO NOT MERGE

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

Bug: 118454372
Change-Id: I56ecf7b2d2401be103a0802bda92eaaf01769183