Fix build breakage due to bad merge conflict resolution
Chad Brubaker authored
Change-Id: I66294362fe272a424d5be65171ca6ddcb8287aaf
c1591d0e