Updated from global requirements

Change-Id: Ic983d2b1bf5e602b6ae762b5ef37d6384023c5a1