Fixed reported review comments

Change-Id: I93bae33c664e9d4b7c0296f56858d70a4d674e2d