Merge "Fix issue 3479042."
tree: 711b978cd32555fe181cb36260f702753c19396e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/