Changes in response to review comments

Change-Id: Icd7e2b036d687d6d6344c313f538406906a4e39f