Updated from global requirements

Change-Id: If7d3b808bcec6e4c0e413a91409835c4c8563a5b