Updated from global requirements

Change-Id: Ia1c665bc9cf86003e72984564c6b954115ae13f0