Merge "brillo: Don\'t even try contacting the camera proxy"
am: 15ca784102

* commit '15ca784102df7fc8259509b564d8085273d2a340':
  brillo: Don't even try contacting the camera proxy