Merge "Add more trace categories." into pi-dev am: 6d9f7943fb
am: b60c453620

Change-Id: Id8552da026c343728dd9ce5d633bd7f3aae0054c