Merge "Fix compile-time error." am: a5f295fcdb am: cc5163d36d
am: b98749ca9c

* commit 'b98749ca9cd975f14cbaf57c867ea189625a715e':
  Fix compile-time error.