Fix build breakage due to bad rebase

Change-Id: Ide8190f10add027b18a34bb2604d3cd407d94224
2 files changed