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

Change-Id: I3d9af498968a614de17928cf9dca25da7d6e23a8