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

Bug: 118454372
Change-Id: I4b5e4e99649250b4bd65e780925c5fc3001fe710