Updated from global requirements

Change-Id: Ia0b7ecf2eed93e8dfe16ce71a221a5e0c1209c3d