Merge "Add missing nullability annotation for BlockGuard"