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

Change-Id: I3ae1a99852d5c9c4a87ee402b3e2e1cc88b8bd0d