Change password updated for 6.0

Meg fixed some formatting/build issues and made a couple
small wordsmithing edits.

Change-Id: I5bb87ed4b96e4d0720200cd23261953ebedc3e8e
Merge "Change password updated for 6.0"