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

Change-Id: Ie4c5994131a97b9acbe445abef3f4c6e73009732