Updated from global requirements

Change-Id: I8275dd8bfd72d3a71d9606f8822a778023c1f0b9