fix bad merge

Change-Id: If5dc6a0c9b2fdf777bc5518e8c117e3258fcb87e