Updated from global requirements

Change-Id: I3f81b59a1d5e0fc1aaf48e987404a5744d1bd2ad