Updated from global requirements

Change-Id: I673e310dca23de919f308c5a3de9cd98318349a8