Updated from global requirements

Change-Id: I95faa7c87e172c0656aa2ec34108286010b1c5f5