Merge "Fix Telecom dumpsys timestamps" am: c364ff38cb
am: d6d07385a5

Change-Id: Id973365c31e66c2afe885093495c6fc981bcd282