Updated from global requirements

Change-Id: If9e276a98fa46b4737acb71a82e085a0f4d637e1