Merge "Deprecate TimingLogger"
am: aec0ab99d4

Change-Id: Ie6709d7e83ee68d491eac481635bcba3d44efe1e