Updated from global requirements

Change-Id: Ic3b5de6a54951b4f9a6449f97aa1ab9c395a2f08