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