Updated from global requirements

Change-Id: I6e40b913ce0687e260c13e3cf2acb700a684fffe