Updated from global requirements

Change-Id: I98509da729ce244ecf3c96844c0138daa8045105