[automerger skipped] Merge "Remove unnecessary usage of deprecated Time class" am: 39b253ff6c am: c80913eea8 -s ours
am: 6a09b2d590 -s ours
am skip reason: change_id I8221a4303b075afe8e8243863915313e4a81b6e4 with SHA1 d5f0a399f2 is in history

Change-Id: Ic1d40342430e87bf6f26e1ef2421664fdf865231