Merge "Add kotlin-annotations to PermissionController"