Merge "Make the sdcardd domain enforcing."