Updated from global requirements

Change-Id: Ic3114b69bfa7301290ce8c8a8d480cb05af2f053