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

Change-Id: I62fae328acf686020b6c7018c0801a508165674f