Fix merge error

Change-Id: Ibb03797d6ee818a7e3db74076be76ed595830063