Merge "Fix infinite recursion" into klp-dev am: 45712137ea am: e49d1304e7 am: 6483a95ccf am: bb6bfa8f5a am: e090def747 am: cd0a4ac609 am: 3454ab70d6 am: 219f65ba81 am: 016843f3e3 am: 0ca627b3f5 am: fe21703054 am: 052785ce3b am: a681031d28 am: f0aa0bd609 am: bccb2e77a4 am: 586ae06666
am: 39bc0a0ce2

Change-Id: I2809e340a370c45306ed651a9b316b1f8fc0979d