Updated from global requirements

Change-Id: Ic65b03156f50b70045153938a3a7e35fa3856e66