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