Merge "Merge pie-platform-release (PPRL.181105.017, history only) into master"