am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev

* commit 'cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
  Protect runtime storage mount points.