Updated from global requirements

Change-Id: If61c685252a7bd753ee0612aa4885aac6f47045a