Fixed an error in CustomComponent JavaDoc (#10038), and some improvements.

Change-Id: Ifbdae94dc94405eca967a95fe783a85d778f461a