Manual merge for important run fixes cherry picked from upstream.
Quiet errors for update without an embeddable_mutliple_choice_answer