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