Merge "Fix issue with apps restored to lower versions." into nyc-mr2-dev
am: 986d88d7fe

Change-Id: I2347429a663180a86e544c5ca9571fe8c6a57eda