Merge "Fix the build breakage (update API & javadocs)"