Updated from global requirements

Change-Id: I02dddff536946ea6eb7662e2af6ddb8b5cbf5641