Now each one registers in its .cxx file. Change-Id: I811c0d4400c2bdccc1c287269378d7e8ad8743ce
Change-Id: I59a7490ec76b10fd31033d1ceccd1e3eae0ad398