Fix GGC compilation errors am: 40fdc43e6b am: 556c0286fc
am: 42bcf8df0e

Change-Id: I44c7309eb91b696a9fbbad5852c11a004b408277