am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce

* commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc':
  Fix height