Updated from global requirements

Change-Id: Ie86cb1100a20c45c8eaf421bc030221f7c96c2f6