Roy|Added docs and other code changes as part of review comment

Change-Id: Ie866666d7d65c6e3b0277e98023db0405e67a11e