Updated from global requirements

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