am 77710bf1: am c0e22fe7: (-s ours) am 8548c24e: Fixed flaky proximity alert tests. DO NOT MERGE.

* commit '77710bf129fc4140f6b58b05072186f6ba068416':
  Fixed flaky proximity alert tests. DO NOT MERGE.