Address the review comments.

Change-Id: Ia30be9e0081830bb05b6d7655c628d022ccd55d7
10 files changed