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

Change-Id: Id01cceb75b1f4f1ff98b0550b089d93c56da9849