Merge "Fix permission on TM#isDataEnabled"