Updated from global requirements

Change-Id: I14ec93eaa97fc52b39e00175adcd718dfc4579b4