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

Change-Id: Icd375c367293169b2d2f7661fcb337cafd324714