Merge "Fix NPE in isPermissionReviewRequired()."