Updated from global requirements

Change-Id: I0916e6c6590c799daa2e9784a9c61c47ac8180a1