Updated from global requirements

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