Updated from global requirements

Change-Id: I893b7ffbd5ef589a10608c9f705b152c5c910e9a