DO NOT MERGE

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

Bug: 118454372
Change-Id: I1b41564e48e28feffe1af89afc0a671d6ac966ce