Updated from global requirements

Change-Id: I74e8b76733cd2996d93f43fcd139e61e6e26506a