DO NOT MERGE

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

Bug: 118454372
Change-Id: I553a2a02acd733bf801fa5d8ef2848801d847d86