merge with google phasebeam updates for JB