Updated from global requirements

Change-Id: I80ae8c11f0ab6182f9924a8d5f822fd51d30d1b5