The rest of Branch was completely unused, so rather than leave it as a completely empty container for NameKey, remove it entirely. Change-Id: I8fc7389f47eb27ed10d052397224d4e3d4316f36