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

Change-Id: I47acc36fbc439b4022e9f367ac0c38fc97e3979f