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

Change-Id: I461f7872ce504f6b47da8c0c638bc3a2aa7793ca