Documentation updates with assignment consistency

This reverts commit bbc934d0bf9872509e1b30fc0461668d9e6edcf3 re-submitting the original
change set with fixed code manipulations.

Change-Id: I3d78eed4dac191e4ee775d2ce4f6fcc935e7d204
Merge "Documentation updates with assignment consistency"