am c041aced: am 33e81df7: am ddae5f1e: am 8b6d5b6b: Merge "Clear binder id when determining external storage state" into mnc-dev

* commit 'c041aced5acb4194bc64ec75d20842519a6801c8':
  Clear binder id when determining external storage state