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

Change-Id: I1f00b19aec6123a4ea96fe55e6f0dc86b794bc04