Updated from global requirements

Change-Id: I6d8caee156dffec94a4e01d87e5d6ceed19bb5ea