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

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