Sync with global requirements

Change-Id: I62bed36fd38426952c222dfaf25dd0c9e75e339c