Updated from global requirements

Change-Id: Ia4aec9704d5ad6adc748a7373fb1d72bbbf64f85