Merge "Add missing size annotations"