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

* commit 'ae310b4618dd388e142eb3e1c4a5ac63e6aeb032':
  Skip mounting sdcardfs in core mode.

Change-Id: I452046570623ac7c5dfb51e2ddb8f3e2d0adc0c4