Updated from global requirements

Change-Id: I0aff20c32aee781ae4571aae74a5767327db6273