Merge "Revert "Fix permission on TM#isDataEnabled""