Change-Id: I5cdb4e0b57e00743cb1a4409a1fc8b519ae38ddb
This mirrors the layout on the server side. I don't consider this a breaking change, as the existing sync commands were broken to begin with. Change-Id: Id80e148e2a0218d6bd64673bb09c15ab0d98418b
Change-Id: Id92c17cf2cd11bf653afabd2e283519f94a5dc50
Change-Id: Idf7153aa287adc874a2878dc829950fda52a4879