Updated from global requirements

Change-Id: Ia9f19d0352a801325e0ed82543e38f95c891e5df