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

Change-Id: I67d6ed904e237138c030dccfcfcb0e8a4f16216b