Updated from global requirements

Change-Id: I678b31668136ec793f7f4dfadbf64cd4760af8d5