Patching UI - changes for downgrade

Closes-Bug:#1331464

Change-Id: I233606c7c6c572f8913ee843d48fba03c77a1929
Merge "Patching UI - changes for downgrade"