Merge "Allow OFFLOAD timestamp correction for MSD/BUS combinations" am: 74cfcdf823
am: 8cc35dd935

Change-Id: Ie75b885965d08703564bdb93f6591952c0504262