Updated from global requirements

Change-Id: I51d9ba55b39663fe213ccd1446ff2c35b9e4bda4