am 39f1c22b: Merge "Fix storage warning hint crash" into gb-ub-photos-denali

* commit '39f1c22bbe02a5d8edaa1e0ba60e49ed27215e4b':
  Fix storage warning hint crash