am a6af40cd: Merge "Add secondary external storage support." into klp-dev

* commit 'a6af40cda29837fb68507f431ee5a179db93de28':
  Add secondary external storage support.