Merge "Remove temporary upgrade logic." into qt-dev am: 12efd33993
am: efeff3ba0d

Change-Id: Ib66c2d7793eb89147aebbcc3e1fc56c6b1955fe2