Updated from global requirements

Change-Id: I92b1f9c8a5706c91054ff0519e60590fe12dbc69