Merge "Fix infinite recursion due to error log message"
am: a57d7229ae

Change-Id: I5ffc80d4d7080b2cc2aa30de00a1d99dfbbad8f4