squash all changes in one commit

Change-Id: I3438d5af3985a4f02562ffe0a9799b5eee855a71