Updated from global requirements

Change-Id: If558b7d8a106d97e16c57c723a8200393c6f9b22