Fix merge errors

Change-Id: Ic9f7492e90ffe6f3867b29114f27609926bd3877