Fix merge issues

Change-Id: I11a0fd9d148c256eb1243e1b2d33ffe51c7c0f35