Merge "Fix infinite recursive loop" into kitkat