Merge "Merge "DO NOT MERGE ANYWHERE Add test for files in no_backup folder." into nougat-mr1-cts-dev am: 90d34d3c74  -s ours"