Merge "DO NOT MERGE Decoder: Modified setting of error code in set flush api." into mnc-dev
am: 6a09a35355  -s ours

Change-Id: I01c0bfe70914107bee7763ec1beec9bd7abbf175