am 81d1f324: am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4

* commit '81d1f32429559cf8039bc2d2e746b0e4c63fa8fd':
  Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4