Updated from global requirements

Change-Id: Ibf039ae20cadf22b028895163dfdb5ecc6cc42bd