Merge "Prevent errors in compilation of c++-impl."
am: ab099dd0da

Change-Id: Ibd7a034ea6bbbfb9c4360c28a9d3d5bd5fd13dc8