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

Change-Id: I041366ad064f29c4a6d68b26915fa6bcea0b6e75