DO NOT MERGE

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

Bug: 118454372
Change-Id: Ie38a83dd65eb908070cb86ed0a49fb197039aa69