Updated from global requirements

Change-Id: I21eb878192d8c54b02e6f0f426da3bada9bcaa0c