Updated from global requirements

Change-Id: I8942f813b5d33fbad2883a30a2422d0b5474c1b5