Updated from global requirements

Change-Id: Iee04e0f6b62cb97824bef2217a3dbd42c15754f8