Merge "Adds stripTrailingFs"
am: 27bb333e14

Change-Id: I355be2bb0b23e69103edc073ffe3adb757e57aa9