am 94629bde: resolved conflicts for merge of 779a38a5 to mnc-dr-dev-plus-aosp

* commit '94629bdec34b253fa2e9cd9ec800715b3c3a4f7f':
  Protect runtime storage mount points.