Taking care of code review comments for ddd01f7b17f0e15a6dadeabfbe2ada26d1d3e83e commit.

Change-Id: I5ba9fe1006fb9243e93b16b6d95d2e2f83a59d16
Merge "Taking care of code review comments for ddd01f7b17f0e15a6dadeabfbe2ada26d1d3e83e commit." into R1.10