Merge "Handle alternate status values." into oc-mr1-dev
am: 0240dc99db

Change-Id: Ie386bdb4c77df1305d80f604f48174794c3ee0c1