am ed773ea8: am 8fc4d57d: Merge "Avoid a building error"

* commit 'ed773ea8db3d4ea828f1220e234922a987fefb3b':
  Avoid a building error