Merge "Correct PowerManager transaction IDs." into oc-dev am: 5aab417693
am: 0896079677

Change-Id: I7d3d064a08c64202b49d5b12bd864291dc84a8ba