automerge: 2a11473
* commit '2a114737c636e69a65478778c6edb24c2266518e':
camera2: Make legacy error handling more robust.
automerge: 2a11473
* commit '2a114737c636e69a65478778c6edb24c2266518e':
camera2: Make legacy error handling more robust.