Sync with global requirements

Change-Id: I80ca2b53d02d37b05731eb7a907152b7c2099c46