Updated from global requirements

Change-Id: I68a67b825e4fe88d73ed5c9bbfc083955fad2b43