Fix merge fail

Change-Id: I023c4647678833d7a58534fc9f5f358e8d6764d2