Addres review comments from review id 233

Change-Id: I81f8af25a25d70214c5e1e9ab73a2392e071a86f
Merge "Addres review comments from review id 233" into R1.06