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

Change-Id: I65aff25a85b36a7c00dd778eb3f141530a86da90