Merge "Update lock task features name and javadoc"