Updated from global requirements

Change-Id: I6838e089c1830fd1cc318f10910381b4d59a2ed4