Updated from global requirements

Change-Id: I61dee7458b3b3c2bd0e9f7c87aad2e9586841f88