Test: xts in same topic Fixes: 136431772 Change-Id: I129fae6e1fc93d26ea027bd67f46ea664728e913 (cherry picked from commit 7912df29)