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

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