Updated from global requirements

Change-Id: I63cd624af7d7b8f8a8d733fc7c2f8eb011a57000