Merge "Fix infinite recursion due to error log message" am: a57d7229ae am: 4f4181825a
am: 751351a022

Change-Id: I7681e833c032ac765bd712b9d5ba122a4ca78b2a