Fix merge error

Change-Id: I5d59321e84c165128092174076f90b937d3621d1