Merge "Map the new category keys to the corresponding fragment." into pi-dev
am: be5fa599be

Change-Id: Ie55eee4ac77b9ce9be5f9d1ff3a0bb769fb2f5b9