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

Change-Id: I4283f8a80b294e615136686d684c65c0a13851a8