am 96ab33be: am bec81d19: (-s ours) am 51852469: Merge "VVM: Do not do full sync more than once within a 1 minute span." into mnc-dev

* commit '96ab33bec023d3a17e36403de86d28e9f4a5cf19':