Merge "Encoder returned an error while explicit flushing"
am: 2f5612ef84

Change-Id: I5cab81980db628f6f4cbe9f0a8bf92d3dd2e76a5