The first description (which is a combination of “statecontingent” and “calendar-based” forward guidance) could be regarded as a necessary condition to the second description (which is a combination of “state-contingent” forward guidance and “conditional commitment”).
For more details, see Sayuri Shirai, “Monetary Policy and Forward Guidance in Japan,” Speeches at the International Monetary Fund (September 19) and the Board of Governors of the Federal Reserve System (September 20) Held in Washington, D.C., Bank of Japan, 2013.