Updated from global requirements

Change-Id: I3b43318be449e5c199e75de5bf9548f4d4a10d10