Merge "Rename settings category." into pi-dev am: 24044a78bd
am: ba5b6dd1ed

Change-Id: Icc2ba94b64fbf09c4618a91a880ea8da91e49d06