Merge "Correct PowerManager transaction IDs." into oc-dev