Merge "C++17 compatibility: add a non-const char* overload."
am: f919d0a0b8

Change-Id: If7e1734510436b2434663122b7a79a00b0ec03a7