Merge "Fix stub_test after semantic conflicting merge."
am: 1345aa3

* commit '1345aa365e8baae25d2b3a859a4858fffbe6b11f':
  Fix stub_test after semantic conflicting merge.