Merge "Label esdfs as sdcardfs"