Updated from global requirements

Change-Id: I007293990caf5020d2c8eafae61cfcec29a60dc0