Edits for consistency

Partial-Bug: #1250515

author: diane fleming

Change-Id: Id8f48b14e7bc9119c7261ff0c6c4f63f25498880
backport: none
Merge "Edits for consistency"