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

Bug: 118454372
Change-Id: I6b85bc54ed30bf7711e9b4bff80e181d7ec2b11f