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