DO NOT MERGE

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

Bug: 118454372
Change-Id: I0d030c054422b75b01be705c6b6a5bdcba3107ca