Updated from global requirements

Change-Id: I24ac192cbd8b4edf8f5a0ee2f9b3613d46899deb