"Has default form" replaced with #default_form in generated categories

Change-Id: Idc38c4e576a9713ae5297f731c59c0cc904d6164
Merge ""Has default form" replaced with #default_form in generated categories"