Updated from global requirements

Change-Id: Id2215687dc506d8387ba60aa2178d2b1bbe5b7b0