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

Change-Id: I82d647e03a703253fd3a07ecd5f30bf6b25e1fa6