Updated from global requirements

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