am 0cbc26db: am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev

* commit '0cbc26dbee49058a8f2da8a4659943b3ee928b7d':
  Clear the volume cache for all inactive state transitions