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

* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container