fix bad merge

Change-Id: I50869af0b1fb90e16285e05c91f0032d0ad714e3