am e29ef594: (-s ours) Merge from open-source master

* commit 'e29ef594e6836cdeee09de51f3a4b9af11cdabff':
  partial build fix
  partial build fix