Updated from global requirements

Change-Id: Ie07472ed923b666ea894d76988dc7154fe1a5cc4