Rewrites CTS test for key/value backup
am: 64816ab1de

Change-Id: Ib56144c9b2a1820e3ba55a10cae732ef12f8e17c