Support upgrade from r1.10,r1.20 to r1.21.

Change-Id: I7c870d1de62372fe599601b8a03cb378f28db7ad