Updated from global requirements

Change-Id: Ieea15df360e04537de20798a30f73d6dacea1fdd