Merge "Deprecate TimingLogger" am: aec0ab99d4
am: 416618a591

Change-Id: Id637c04d15e48a928b7ff05a3133dbb5cf103656