Add defines file so namespace ID is only defined once

Change-Id: Ia9233763900f6a9519de11ea3e0700cd2d519d72
Merge "Add defines file so namespace ID is only defined once"