Updated from global requirements

Change-Id: If54fdc67edc8775584b0636632f5c4ab7aec6ed0