Fix merge fuckup

Change-Id: I794dc242e37d9b657d0f7cb3eec38972cce4fc62