Updated from global requirements

Change-Id: I0f09266c30cb0c2d522fdeba3a87c3b69f9538d0