A few fixes for PM OTA test failures.

Change-Id: Ia4c4df8412216f12a9288d9e7955759213a8b742
2 files changed