Updated from global requirements

Change-Id: I68ca9943bd611061cf34f79d786b161226f13171