am 38cae6c8: Merge "Reconcile private volumes when mounted." into mnc-dev

* commit '38cae6c8bcb86236b21d69f852473351c0c1d82a':
  Reconcile private volumes when mounted.