Merge "Block the upgrade of persistent apps" am: 0b30d95dc8
am: 6de91158d7

Change-Id: I729df40376b972461908d22593b63f4f5399e356