Merge "Fix infinite recursion" into klp-dev am: 45712137ea am: e49d1304e7 am: 6483a95ccf
am: bb6bfa8f5a

Change-Id: I8044bce38ad7713869fbd24fa040915acddb23fb