squash all changes in one commit

Change-Id: Iccf758aedf280d987727425b944794af5aad0f3b