Updated from global requirements

Change-Id: I134101a2979edbadce352d9f2291db4fa603e59e