Sync with global requirements

Change-Id: Ie47804617ab9a11a91efd96c7989f0207e47e120