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