Addressed comments on patch set 2.

Change-Id: I2ed63b9cbe6cf28365dc36b07de2d70d49ad04e2
Merge "Addressed comments on patch set 2."