Changes in packages for icehouse

Change-Id: I759a01c50e3d86f574401e6f092cd2d48dc5cb4a
Merge "Changes in packages for icehouse"