Merge "A few fixes for PM OTA test failures."