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

* commit '01841c73a5a824a34d794ec69e2769b088306485':
  Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4