Merge "tombstoned: clean up TODO on anr writes"