support upgrade from 1.10,1.20,1.30 to 2.0

Change-Id: Ie8f4a449ef392cb181cc92d8034fea791a17cf17
Merge remote-tracking branch 'upstream/master'