Updated from global requirements

Change-Id: Ia70bbde29c81f9fbfa0def64e46eba309ef6a147