Merge "Deterministic PowerManagerServiceTest" into rvc-dev