Merge "Fix CTS test where permission is not held." into tm-dev