Sync with global requirements

Change-Id: If05a5d65558ca848b80c3f57c19cb5029adbe58a