When annotating, skip any branch nodes that are content

We don't have these yet, but when we do, we'll need this

Change-Id: I1c2572f00fc0b9a144bb4092a44cd5af2bb752da
Merge "When annotating, skip any branch nodes that are content"