Attempt to support both cliff 1.2 and 1.3.

Change-Id: I5a5787867af09086c9945ace6f12153b17396bf7