Updated from global requirements

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