Updated from global requirements

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