Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier