fix merge problem

Change-Id: I6bd2dcb8c2567f5ab268d24f4e3b4c2a2e807b93