Enforce space before generic_attribute where necessary

Change-Id: Id378b2432f4f9dd4caf13cc4d53a9fe5db8dc57e
Merge "Enforce space before generic_attribute where necessary"