Updated from global requirements

Change-Id: I255c0ed081ca480ee45ce4aa78ac11b1caf90cf4