Updated from global requirements

Change-Id: I0232c1edb846292875a045fb6d7846b33b43707b