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

Change-Id: I26d7ff82acd12f89e991fbc8dcc4dc801cab6cc2