Updated from global requirements

Change-Id: Iddf9be2b384f9c0871a2baf59e94ec5201ca37c6