Updated from global requirements

Change-Id: Ic1ecadb8e446a0afb9c81b12b7ebdebeb7b28982