Merge "Refactor test 983 to prepare for inclusion in CTS" am: 7fe39afe80
am: 90fe92e6b9

Change-Id: I2b4a8fd5268d05db3ff7afe404c2a2941d7aca87