Upgrade labnet1001 to icehouse

Change-Id: I35cd0ba3e3614499878f669361360f1790b5cfe4
Merge "Upgrade labnet1001 to icehouse" into production