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