Updated from global requirements

Change-Id: I61ec91dd485ae6d3b81feb0c40689c1351d70653