Fix merge derp

Change-Id: Idf15d34a5e5c58d8e9dd5371990b4dac6e56d28d