am 2d946f7a: Merge "partial build fix"

* commit '2d946f7ac9a74870271179d5d7a16a5f9ed61641':
  partial build fix