Fix merge issues

Change-Id: Iff2cefb661ebe0f55c68175453fca48867e8fc90