Merge "Add sdcardfs variable to storage_config_props"