am c5a42cf6: (-s ours) am ea60bf42: Merge "Fix some VVM status issues" into mnc-dev

* commit 'c5a42cf657f017a3b7d745ac62d57e818990ce01':