Updated from global requirements

Change-Id: I0fda50f86911adca2d977f3d73c95386b18ab672