Updated from global requirements

Change-Id: I4d7105e5a36c0cbca90b5a9e5c6bb3ed7ea8f301