Addressing some comments from gerrit

Change-Id: If46c7bb4a94d5f7c13e6f5d1727857feac36b3ba