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

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