Updated from global requirements

Change-Id: I67092a80ecd71f1210761dc8658f33f64a4078b8