Merge "Complete OemLockService API."