Merge "Fixed bug in disassembly of roundss/roundsd"
am: 8bf927b5c2

Change-Id: I778093acc109aedb21c234dd4a40efea63695dc7