Merge "Add new traces."
am: 3b4faa69d0

Change-Id: I0eeaec19946a31fb004e936fb3f3a02df4cd3c97