Updated from global requirements

Change-Id: I6fce8c7afe8abbd170461b42d0f07e85b79dffe4