Merge "Only full-data back up regular files + directories" into nyc-mr1-dev am: b3ca7c26e1 am: 82d9562f27
am: f722c821f7

Change-Id: I90f8ae83861e7dadf2c5b7678976b14e48c2857d