With b/6979211 fixed, we can reinstate timestamps.
This reverts commit 578531082b
Change-Id: I5dffc8d9701004f7c6325f21e1e33d1cdd2d05c0
With b/6979211 fixed, we can reinstate timestamps.
This reverts commit 578531082b
Change-Id: I5dffc8d9701004f7c6325f21e1e33d1cdd2d05c0