Resolve merge conflicts

Change-Id: I64d04284fed35440933f678de78eec6e046b4bb8