Updated from global requirements

Change-Id: I429f9bcdcdf88773a7d0af3b1a8c0c11377c2336