Merge "Wipe metadata when we wipe userdata and cache." am: f88905d231
am: 9f5aa032f8

Change-Id: I001d86a509e46b313bfaf116479ccea3b175cdc1