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

Merge "DO NOT MERGE Decoder: Modified setting of error code in set flush api." into mnc-dev am: 6a09a353  -s ours am: b288f517  -s ours am: 458c4a86  -s ours am: e8235bbc  -s ours am: 23d50580  -s ours am: d570b328  -s ours am: 82e6cbe7  -s ours am: 16aecc3c  -s ours
am: 4a356a01  -s ours

Change-Id: I03e86e7361489a3210ecbeaaff8ddb19da4ae24e