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

* commit '06a1b202613b861ae43d39510cdd47d0d1c84893':
  Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4