DO NOT MERGE

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

Bug: 118454372
Change-Id: I9183befb1bb273c078967f2d5a175ae4ef9a9371