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

Change-Id: I96c6ccb4bdc1ac5e4eee97aa8296723048948064