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

Change-Id: Ib6bcd7285793409f3ce8079c88b2c8d80847a381