Updated from global requirements

Change-Id: I31700b01e5b56221059b64ca66ec2e7d374d5c84