Updated from global requirements

Change-Id: Ia6743a86accc2741a235e05a717ff408c092e471