Merge changes Ib4232854,Ic7e95cf0

* changes:
  [API] Add offloadOnly API
  [API] Upadate queryOffloadCapability API