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

Change-Id: I04da3aeeecb65c557fe0715d7d97d182f07c43f0