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 Change-Id: I673972e25b586ceb6f7c162ef1385dbb47fa3c29