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