Merge "ComponentAlias: Change device config namespace" into tm-dev