Updated from global requirements

Change-Id: I60b5f353200c490ba018c817af6a0865f60c6130