Updated from global requirements

Change-Id: Icc67410c32244a1b1dfb6484acf4581c53e47fb5