am 6a07244f: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev

* commit '6a07244fa83a4c6296d8a743238b6bd936bfb3ba':
  Prevent sync state changes when user is a monkey