Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: I17b058fafefd02aff00c95c2d476f9da6d1a6aec