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

Change-Id: If861e34f9b4633ce9b64d508d76616010032ce62