am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage."

* commit 'a166bea18ffd304163bddec4701904d91541f527':
  Fix a sporadic build breakage.