am 80790d78: Merge "[PB3] Simplify storage"

* commit '80790d78f64a3dbf907773e1302e8a8ca65d3766':
  [PB3] Simplify storage