am 1829a4b4: (-s ours) Merge "Fix build. Cherry-pick...
am 1829a4b4: (-s ours) Merge "Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE"
* commit '1829a4b4':
Fix build. Cherry-pick 2393c364b0f727c6b904febba32ad2ddc4142c96 - DO NOT MERGE