Addressing some comments from gerrit

Change-Id: I7fac7b8b75a975a9b49cef3f4a02f287db6d0530