Merge "Skip mounting sdcardfs in core mode." into nyc-dev