Updated from global requirements

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