Merge "StartsWith/EndsWith allow std::string prefixes/suffixes now." am: 2aa4cc4f36 am: af24c0d246
am: 3601d3af3a

Change-Id: Ib8547528ba82613b192fd1967af170739d79bbe5