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

Change-Id: I8e0b136dbaf95ad501f95a7b5e61e5b1b83c5248