Updated from global requirements

Change-Id: I8ec0fdaf8b48c1ca71270bfdb1e22124407195ef