Updated from global requirements

Change-Id: I851f4158db2fab79ff0603b4d568e1e51d1c2ecc