Add namespace element for custom components (#7749)

Change-Id: Iea7e4057df5a61805ba2f6c087fbb3bcd23f68c7