Consolidate SAD tests. am: 2c029f35ee
am: 76e08ea4a7

Change-Id: I7de87026d0dfcac559cb7fb1f7e43f436a442a10