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