Updated from global requirements

Change-Id: I52036cf38af6ba2e59e751c2bcb8cd31e37c01de