Few updates and fixes for labs000

Updates for IceHouse release, fixes grammer and bad indentes.

Change-Id: Ic5ea7751732b9e425955aaa3d38cf8cf1354c003
Merge "Few updates and fixes for labs000"