Updated from global requirements

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