Merge "Fix build broken by cad8269d45f5478b2a9." am: b53880e298
am: 69b200cf29

* commit '69b200cf290fa34d21333016a76eeefacf9966e9':
  Fix build broken by cad8269d45f5478b2a9.