Merge "Update the javadoc for the clip path fix."