Updated from global requirements

Change-Id: I9e465f865e6bd83ba7e2096db6837c90466a4e92