Updated from global requirements

Change-Id: I703434e153f43c69508a278eb8a74c3a4680e2a2