Fix merge derp

Change-Id: Ic9b3e3a07e0d705efc93a38cbf1a3e5e892e30ee