am defca66b: am 0cc5a656: am 5bb4c94a: Merge "Don\'t remove content URI shortcuts during restore" into ub-now-porkchop

* commit 'defca66be6d5968b9d2bdd7c708bdf0971fa0cf1':