Merge "Remove old @Postsubmit annotation"