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