Merge branch 'stable-2.13'

* stable-2.13:
  Fix compilation error

Change-Id: I1b5b20873e2b194b618052d14c5b4ca31c0b9b2f