Updated from global requirements

Change-Id: I57e6da645e5e546c8ec7fc173fa33cce4a5c45b9