Updated from global requirements

Change-Id: I9d94f64c6606ec76ce84648991da507b98e33598