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

Change-Id: I92163caab6e2e65565d80bcf7f3661eec757afb1