DO NOT MERGE

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

Bug: 118454372
Change-Id: If897b9d79f937e7cae6e0f131e66e68f1bf4b4f1