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