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

Change-Id: I28aeac2c4ebad13a23b20e22ff31674f61ba17c7