Merge "Grant URI permissions to the MCS" into gingerbread