Merge "Reset direct output thread timestamp on flush" am: 394b76dd52 am: 1976ed32df

Change-Id: Ib2b7b405bcab0d63cca5c130730923640aa6e8d2