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

Change-Id: I5319cc775e7381e697ae365cdf7433d4bfdf56bd