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

Change-Id: I7937d4c31079c1717c9143823d5ec49976aaf21e