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

* commit 'de404257a99d3a94b4d92923248af77817e447ed':
  Better handling of storage paths.