Updated from global requirements

Change-Id: Ib0d1f0bd525f037e6c2e5b4897650e6393a32f1b