Merge "When encountered an unexpected status, mention it" am: 071c4b37e8 am: c0aa8dd3bc am: a955aa3541

Change-Id: I791d218bd1feb377220cf45f8454e9a90cdd0ae2