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

Change-Id: I0c9897e77cbd35991dae21aaec06466f8c071316