Merge "Revert "Add logging for user permission interactions."" into mnc-dev