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

Change-Id: Ic5f511382c2b265307ba216925075e6462773509