Fix compilation errors due to 2 independent changes.

Change-Id: Ib7aa41aa6c95ec17ffde2644320b851f8f02f85f
1 file changed