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

* commit '93bc61764eb8417165de2bbaa6384165f7298a32':
  Fix compile failure after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4