Updated from global requirements

Change-Id: Ie1ce367075e4b32b0bf5acc32aa7152cd3fbff0f