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

Change-Id: I95052b1929c4760b371aa8a58157cca8823166d1