Merge "Fix some issues found by new doclava linter." into oc-dev am: a00c7c0a99
am: db73950734

Change-Id: I388d85c9eedccee594832e9947e2f8f095fbb10d