Updated title, minor editorial changes, fixed bug

bug: #1175199

Change-Id: I43134db9731d1fd4989f5136070f1c2467409740
author: diane fleming
Merge "Updated title, minor editorial changes, fixed bug"