am 265b194f: (-s ours) am f610bd78: Fix race conditions for camera prewarm service

* commit '265b194fac5b300461a6c70ada18d5a3d898adec':