Updated from global requirements

Change-Id: I453dd92dd945a5b4ab717bd159f752484060278f