C++17: fix name collision. am: 19306140a3 am: ec31cb7ae0
am: d42e987976

Change-Id: Ic514e1307e0ad3009bb0bda98be6777229080050