Updated from global requirements

Change-Id: Iaff1d1d9b836b8dede6dbf45ed7d9d72b9f715be