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

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