Updated from global requirements

Change-Id: I151da83d3efa29e6e02f541a1f9804713422f921