sqaush all changes in one commit

Change-Id: I796247c74693add37d07f927509442e1216f79fe