resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ff
am: 295a488e49

* commit '295a488e49007fc0493135d5003ec206ecf308b2':
  Camera: Disallow dumping clients directly