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

Bug: 118454372
Change-Id: Ibc7ddf231ff61272439b9a621490acaff27ce563