Merge "Durable metadata for pending and trashed files." into rvc-dev am: b1232ffe2f am: 03a827a977

Change-Id: I616d23ab317e4a6d06e876929783e4b7c95892dd