Support 1.10 to 1.20 upgrade as the release version changed from 1.11 to 1.20.

Change-Id: I9e182b4ba26a29e002ca793e45a02218ecaf36c3
Merge "Support 1.10 to 1.20 upgrade as the release version changed from 1.11 to 1.20." into R1.10