Merge "Add conditional permission check annotation to checkPermission methods" into tm-dev