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

Change-Id: I558701ee329b4a5c31c39a43eee71cf71f1bfd18