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

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