Merge "Set timestamp correction and downstream latency logging as very verbose" am: 3ec7c256a8 am: 240a1ebca6 am: ff9fc0702f am: e9bef508e7

Change-Id: I3682a819f171af49d1fba81db51ac0bf78539d8d