Minor fixes: Addressed the comments.

Change-Id: I77272e75addffb27e6c6c5ef914a681d79847dae
2 files changed