Updated based on review comments.

Change-Id: I0e009fa4d7b96544e4b4ef1e335052648df7d672
Merge "Updated based on review comments."