DO NOT MERGE

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

Bug: 118454372
Change-Id: I2b1aef1af16acbdc98236527eb292f1332dd2ae6