[automerger skipped] Split client and server impl am: a6d6fa3d9d am: 6fc5d41149 am: 6adb27af27 am: ff97767baf -s ours
am skip reason: Change-Id Ie142b19a5c435a0b4252ffd297504bde69eb44b0 with SHA-1 7e9e37fa0a is in history

Change-Id: I04bc56f2c7a96a396eb7e1f6b2e838adf2e94196