Fixed build breakage

Not sure why this caused a build breakage since it build locally
and also on TH. Commenting out for now and will investigate later.

Test: builds
Change-Id: I8d6e475b1bad02f8b8461790381e63aff03a28ec