Updated from global requirements

Change-Id: I2555e916f8f69ecdc326e28322f46c1aad97a425
Merge "Updated from global requirements"