Updated from global requirements

Change-Id: If8c83c21d95039a776b04b333bac67bd676e71da