fix conflict

Change-Id: I298272f356659e1d91972e65222f20a9087abe39
2 files changed