Updates per code review.
Updates per code review.

svick/cli,dasMulli/cli,ravimeda/cli,svick/cli,harshjain2/cli,ravimeda/cli,johnbeisner/cli,ravimeda/cli,livarcocc/cli-1,livarcocc/cli-1,harshjain2/cli,Faizan2304/cli,livarcocc/cli-1,johnbeisner/cli,Faizan2304/cli,harshjain2/cli,dasMulli/cli,Faizan2304/cli,dasMulli/cli,svick/cli,johnbeisner/cli