Updated from global requirements

Change-Id: I0a15d52c49efe8bf6029f28e9557a63b18f7d569