am de50cfb5: Merge "partial build fix"

* commit 'de50cfb5f961a1ad4ceeeec2108147555fea0e22':
  partial build fix