Updated from global requirements

Change-Id: I35b8e00b3166fd212eddb1281084d40012a87197