Updated from global requirements

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