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