Updated from global requirements

Change-Id: Ia8897fb17cc36d7654dab1dcc148485413209088