do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.

Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
2 files changed
tree: ba929cc3609584be4ca38abdcd807d80d0b6212f
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/