Updated from global requirements

Change-Id: I0183e9260901155bd03e4905f286a5c041cb0ae8