Add missing merge

Change-Id: Ic6edb9b11e04f77f8844704595f3602b6e958602