Updated from global requirements

Change-Id: I4087a8cfc100a8bd1f30677302b9a998a79c0b3f