am a10f83bf: (-s ours) am f5fb9cab: DO NOT MERGE Fix for Holo failures

* commit 'a10f83bf68d98c8eb66de5c23c00a7a71bcf5641':
  DO NOT MERGE Fix for Holo failures