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

Change-Id: I363cf717193316eaa9ad910284bb3140c6684dbc