Updated from global requirements

Change-Id: I679d3f52545af840ee5cbc87a05dae9e54416933
Merge "Updated from global requirements" into stable/icehouse