Merge "Fix NPE in AppOpsService" into mnc-dev