Merge "Disable testOffset until it can be revised" am: ada0dfd323 am: f46b6af27c

Change-Id: Ib65f3c247356a890de97cb2be88e5e2ca551aaad