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

Change-Id: I0416efba808163f354645fa7f2737c20820fdbe9