Merge "Fix PermissionHelper NullPointerException"