Merge "Make sure we can properly shutdown even if" into ics-mr1
tree: 8cd10d7ed5228247ee71cdf01dd8619ab1ee4999
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/