Sync with global requirements

Change-Id: I24fede7e1c3be7b59f1fd8d6d584632d75a97da2