DO NOT MERGE

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

Bug: 118454372
Change-Id: I37b94a5b9a260cb3496c1facbb5efb11497b1dfb