Fix 4.2.2 merge Derp

Change-Id: I1b84c3700bc29b91eccb766af0b71bd8d93243cb