MetaBlockNode should be a BranchNode, not a LeafNode

Change-Id: Id6f99ffce553d45cb2bc0250721ceec25333e1dd
Merge "MetaBlockNode should be a BranchNode, not a LeafNode"