am 4b94247b: am d21fb012: am 012c9bbe: Revert "Block apps instead of uninstalling."

* commit '4b94247b30ec6501b7d01d61cdf7c327f6a5d1c1':