Merge "Merge "Handle alternate status values." am: b728e56959 am: 0f6a2f350d  -s ours am: fdd7b14c68  -s ours"