Icehouse branch version updates

Change-Id: I65d003e912d17854d1173154178521af431f9b1d