Updated from global requirements

Change-Id: Ibd80a5e3a7bd7d255dc3e1779e57353ca2d6ca89