Merge change 4307

* changes:
  don't require some OTA features