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

Change-Id: I564b541c1a76563fee530f38d65f13b3014cb83f