Tapl: also logging contexts
am: 6938276da1

Change-Id: Icd3dfd36d6141f1565cfa25a27d9edd8db3227ec