fix merge errors

Change-Id: I569c802bdd86c103209975b56d8b0ce252d12720