Merge "Clear binder id when determining external storage state" into mnc-dev