Increase timeout waiting upgrade is done

Change-Id: I398d3db60323baea41dc1430a0c4b4724a736e75
Closes-Bug: #1349481
Merge "Increase timeout waiting upgrade is done"