Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev
am: 39e8819755

Change-Id: If5f5953b95e27a809b50f7baac8a9a9ab99b1a14