am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '0bf31aeb5b0e58cd167aaee2a6cb4d9248e0e66b':
  Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4