Updated from global requirements

Change-Id: Ic2c44e1410592d7080af7eb8f6df8f955382393c
Merge remote-tracking branch 'upstream/stable/icehouse' into stable/icehouse