Merge "Service for OEM lock management." into oc-dev am: e52a1bfede
am: d4be031c76

Change-Id: I9ab76546a140062940c128abdc2b8b4072d3b0f2