Updated from global requirements

Change-Id: I744a629cf685760ad96d60654d081fc495024ea8