Updated from global requirements

Change-Id: Ib9080a3f924d23fe203d27cc23a4b8f666cbf5b4