am fc5fdc85: am e45d96d6: am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b

* commit 'fc5fdc85683f87c42d5ce7bcee4e2b70ef0acdd0':
  Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b