Merge "Recover shady content:// paths." into pi-dev
am: 7402d7611c

Change-Id: I499e0086df06d77d1fce3afaa86bb19a136b1ca2