Updated from global requirements

Change-Id: I0c5fe8001eb377c3359f73b97131293fadd57171