Merge "Add static lock in PowerProfile" into oc-mr1-dev