Merge "Added timing to some more AnnotatedCallLog operations." am: 9ed12284f4 am: c80240f11d
am: 0850896fa6

Change-Id: I81f849f846843536dba57d5fc6558a8f5af3c0c3