DO NOT MERGE

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

Bug: 118454372
Change-Id: I04d81367fd7b8e1dc146127fe947e5aa772dad6d