Updated from global requirements

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