DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours
am: dbc9a47831  -s ours

* commit 'dbc9a478311e8728c8148a80abb103fca697891d':
  DO NOT MERGE: fix build try #2