Merge "Adds stripTrailingFs" am: 27bb333e14
am: a91491a3b8

Change-Id: I6b850d252fb40395bc312f4ed8be383153af52ef