Updated from global requirements

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