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

Change-Id: Ia598782ee86415718cd1812d3c2a2c6205b81bf9