Fix 4.2.2 merge derp

Change-Id: I73ef995e82495b7be170f9d4da094fd0996753aa