Fix API module registration

Change-Id: Ic52d9e7327e5871c5a6b5ad9eba8a07dd6777506