incorporating review comments

Change-Id: Ie1d88c84d276a6387f7070f1db560150a84aab63