Squash all the missing commits

Change-Id: I43d407f8d07628eae6a41bf81614ac5da17b6115