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

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