Merge "Make shortcut upgrading code a bit more robust. Bug: 2558040" into froyo