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

Change-Id: If24337066ead738d141e20fbe8a271fa93de39ae