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

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