Updated from global requirements

Change-Id: I443ff748a62554fa60b41ca802128c8657b5e543