Code review comments incorporated

Merging kwd commit 8f1f4513d7d5a4d2bf17c990fdecc9b0bfdd97a4
Change-Id: I203e647d94d828d3b0dbe02cb72970bab3f06f8e
4 files changed