*DO NOT MERGE* Create new suggestion category for backup.
am: 1c72ce06d1

Change-Id: I07d65c9045c97ac62e4d7bfc0fd96a92fdab5809