am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"

* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
tree: 2aa2cb6936c908494527967d2b865eaf6392b787
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE