DO NOT MERGE

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

Bug: 118454372
Change-Id: I3edbdb681cf4f5b6c4b8011b87bebb87761a59b2