Fix conflict between merged commits

Change-Id: I0489dec2719f02af8927250e078c8ad6f527a970