Merge "Merge "Fix typo in in offload control VTS test" into oc-dr1-dev am:...
Merge "Merge "Fix typo in in offload control VTS test" into oc-dr1-dev am: 5d77efdd am: 9fcc7246" into oc-mr1-dev-plus-aosp
am: 4691e79d
Change-Id: Iae63fc31d515f46861dce02fe3308593d1318774