Merge "Add std::string StartsWith*/EndsWith* overloads." am: dbbba76f88
am: 26c7becfce

Change-Id: Idc313a53ec6dfa08b3c969763aafdfbdcd10f167