am 026d6f97: am de404257: am 556136c8: am c7a60749: am d3719ab0: Merge "Better handling of storage paths." into mnc-dev

* commit '026d6f97d120f7f557a50effd82e6b3b6f032870':
  Better handling of storage paths.