am 7bcccece: (-s ours) am e2ef2c10: Fixing build (DO NOT MERGE)

* commit '7bcccece88734fb714c417d9d263065212f59d24':
  Fixing build (DO NOT MERGE)