Updated from global requirements

Change-Id: I786aa265397eecae2e04f5d5329c74bd8b5f5da8