Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev
am: a04697a951

Change-Id: I9f5c2efb755e6e96805be3feb97f85dc0f4a0ce0