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

Change-Id: I77321ded5927f149e3b1367425f5ed461d01bf99