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

Change-Id: Ib0817f4a53ab63e895a8a57d33841a362e358fa6