Fix merge

Change-Id: Ia055f35c463ef2212430d646e939439882dfca77