Updated from global requirements

Change-Id: Ic005fba7c3ec888d2c047ade1d439d09d12ab0e7