Merge "Updating active-unlock APIs"