Merge "Handle alternate status values."
am: b728e56959

Change-Id: I1c82dd103b03eecba025a7638e06906699429c74