am 7570954a: modifications for new system volume policy.

* commit '7570954a1870a28d8322557dfbe36504328f3518':
  modifications for new system volume policy.