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

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