am 84551e76: am 2dce8b3c: am 5d8b7b22: Merge "Fix build."

* commit '84551e767e7beae692f513fba5ce13c1c8155fc9':
  Fix build.