Merge "Fix lock contention: Call into power manager service from handler" into oc-dev am: 251894b1 am: 53f6c023 Change-Id: I83c68cf4bad91f7baa5016aab0f66f1d5fe2700f