Updated from global requirements

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