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

Bug: 118454372
Change-Id: I329d78c043cc9c178b18d898417562b44a72b9fa