Updated from global requirements

Change-Id: I067f2ff0c78547088500fa2831c1c5abb75864bc