Updated from global requirements

Change-Id: I65149149fd5b80e93961206f1c9e2037db764b84