Merge "EndsWith *suffix*"
am: 73664df55e

Change-Id: I7c2a04e4620ecbf1b1e539e5b6e31c1802833d51