Updated from global requirements

Change-Id: I1f6e27703ebcd0b3e9ae27095aa90d6c0318231d