Updated from global requirements

Change-Id: I8cccaa0c349ecde1efd0ae6d5b8187eb6e3bbe49