Updated from global requirements

Change-Id: I2499457402623cf9a91010ee36aedb84fbe0195b