Merge "DO NOT MERGE Decoder: Modified setting of error code in set flush api." into mnc-dev am: 6a09a35355  -s ours am: b288f51729  -s ours am: 458c4a866c  -s ours am: e8235bbcea  -s ours am: 23d505806b  -s ours am: d570b32872  -s ours am: 82e6cbe7e2  -s ours am: 16aecc3c23  -s ours am: 4a356a0170  -s ours am: 301a5d4bdc  -s ours am: c68f846406  -s ours
am: a2d796cf56  -s ours

Change-Id: I9d72c63b2e9614c84f263cf9aebc99317fda52e7