Updated from global requirements

Change-Id: I1908061f27f26413f484518e0bc1508af3608673