Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev