Sync with global requirements

Change-Id: Ifc794e3bd3d85932fe056e09ee8c72e726ab6872