Updated from global requirements

Change-Id: I41c8b482e67cb98c664cd1cf324f37e2d959d24e