Updated from global requirements

Change-Id: I039254e3d935f8d8f2ab0a48fd142332d1f08327