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