Merge "EndsWith *suffix*" am: 73664df55e
am: c4a42dd62d

Change-Id: Iad3f81efc988383ff99d9b1a08bfaa5d80693889