Bug 49544: Allow margin of error in filename generation

In exploring these seems like it could be the main cause
of bug 49544
Bug: 49544

Change-Id: Ib1a9fe3bf9db732f00268a2f84733755f4bf1f76
Merge "Bug 49544: Allow margin of error in filename generation"