am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit 'af46239a10921980f5030222dff147a592480248':
  Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4