Add/remove comments

Change-Id: Ia9f7bb9f4f5f307dc92b859638bd721db3bde50b
Fixing code review comments

Change-Id: Ib8360e5f9ce063f15d9709859dae1461760747fb
Fixing code review comments

Change-Id: Ifffa4678107487871ecf5ebc78299114c07cbf10