Merge "Rename settings category." into pi-dev
am: a44d07c10d

Change-Id: I3d71989d34d150c6089e24527a55da35833fae6c