Merge "StartsWith allows a std::string prefix now."
am: 80ccac2fff

Change-Id: Ife18e431247a479cb038f21f92ad0b687a9509b8