Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev