Updated from global requirements

Change-Id: I5a972ae65d42664c231807fbbc57ed576839524a