Making c++ compiler happier.

Change-Id: Ie224e968589bdb0774dc112e6f6df56cc0447465
2 files changed