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

Change-Id: I3639559df9ee3217effd18701a8734cd22a58e58