Updated from global requirements

Change-Id: If75f151c4ffcd1c9cddb07d85c75242bc379b18c