am 5d629bf2: am 93bc6176: am 01841c73: am af46239a: am 9abb7401: Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '5d629bf257ee2568d665d2c1d2a5a9fcd15c1ece':
  Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4