Updated from global requirements

Change-Id: Ic0d84da1e3f06679be20973c8f618f561a76971d