DO NOT MERGE

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

Bug: 118454372
Change-Id: I5ed114a4d466cb2c346547c0fcc16acd02965cd1