am 00e3c58d: am 73f7cd98: Merge "Fix build."

* commit '00e3c58d0232952bdcafd02f71e6c9fb00b4d248':
  Fix build.