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

Change-Id: I6dbb54af311b6c7322f877d1afb6ca2897bb5fe6