am 13701b50: Merge "Bundle correlated switch changes atomically." into jb-mr1-dev

* commit '13701b50f533775fd7a547fd0e479c1ec9035ce8':
  Bundle correlated switch changes atomically.