OTA: adapt for changes

Change-Id: I1e86833f46687debd379f9c0317b8e1f8579f0f6