am 65837ced: Merge "Fix issue 5355047: Automated effect tests fail."

* commit '65837cede462b551742f900f2e2f5a1d5dd576a2':
  Fix issue 5355047: Automated effect tests fail.
tree: 8cbf1a657501541509a2ccfe87ad51417e46aab0
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/