am d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev

* commit 'd2c414573242fc59a2d34f66f1dfb610ec7d59a3':
  Let's reinvent storage, yet again!