Merge "Remove unnecessary lock from AMRWriter." into kraken