Follow-up I49b7d8a - Add api module for common metadata

Change-Id: I0d957891e0778ba0454f6fecb06524211506f6b9