Merge "Fix failure in postsubmit"