Updated from global requirements

Change-Id: Icb0a2af0c84ca7ffcb9376dc790a26d2fdf1fc15