Updated from global requirements

Change-Id: I433ee9fbba68e9650382392abb4806e365cbdf70