Small edits and a couple of tag fixes.

Partial-Bug: #1121866

Change-Id: I074dc21aa2d189fde9bc14ddce394071f6acc5bd
Merge "Small edits and a couple of tag fixes."