Updated from global requirements

Change-Id: Ib4aa7305320a77ac2c01a9620d46037f259622f9