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

Change-Id: Ic4e09ade04396d132193d73f37b296e5cedc8e80