Updated from global requirements

Change-Id: I453c26122ce55dbf49d5a34491091b4789825d59