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

Change-Id: Ia80fdd773841edbdbf77a9d8e211b84d61c2f863