Updated from global requirements

Change-Id: I12360870fd4d91cbdc957bff7a316bd48f9bf12e