Merge "Do not call noteOp if checkPermission fails"