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

Change-Id: I0ba3d5feb7bc120f9a162f60e5c2bb61a6a38ee4