Merge "Fix NPE in AppOpsService." into rvc-dev