DO NOT MERGE

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

Bug: 118454372
Change-Id: I733e755ff7b7e9575078c41b6a24d18ab0623316