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

* commit '9359e82213e6027b2390b76ba30e2e44f0d5cec6':
  Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4